Merge
authorKeir Fraser <keir.fraser@citrix.com>
Wed, 23 Jun 2010 22:24:42 +0000 (23:24 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Wed, 23 Jun 2010 22:24:42 +0000 (23:24 +0100)
commitfde661bff917bfce00b7b16d999f5d937f24e75b
tree6a7a037ac21036ebef840e671228faadcde06c0f
parent646ac9f7b4c0fce7fa78dd9e4b22e54386f21a08
parente41d0dba09ec63d99e4c97a0f43a0dea7fdd9cc6
Merge